Do nothing on empty string, quietly.

Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtklabel.c (gtk_label_expose): Do nothing
	on empty string, quietly.

diff --git a/ChangeLog b/ChangeLog
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1e5785b202b94561136330bc91b8865a20ece9b5..3b7525328b596344640a09922fa4fd4b10e68c9e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 16 16:04:41 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Do nothing
+       on empty string, quietly.
+
 Wed Dec 16 15:36:19 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 50166fa0debefa671a5104c4d3db810923aa5c87..8e46a4056df51434be02e219931d8ffc48da69b0 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -878,14 +878,13 @@ gtk_label_expose (GtkWidget      *widget,
   g_return_val_if_fail (GTK_IS_LABEL (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
   
-
-  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
+  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
+      label->label && (*label->label != '\0'))
     {
       label = GTK_LABEL (widget);
       misc = GTK_MISC (widget);
 
-      g_return_val_if_fail (label->words != 0 || label->label == 0, FALSE);
-
+      g_return_val_if_fail ((label->words != NULL), FALSE);
 
       /*
        * GC Clipping